Skip to content

Conversation

lolbinarycat
Copy link
Contributor

the perils of working on two PRs in parallel.

r? @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 16, 2025
@jieyouxu
Copy link
Member

Oh yeah I missed that, thanks
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 16, 2025

📌 Commit 0ab7842 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 16, 2025
@jieyouxu
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 16, 2025
@jieyouxu
Copy link
Member

(Is there a reason this is draft?)

@lolbinarycat
Copy link
Contributor Author

reason for draft is lack of an automated test, and i can't test manually right now due to the build system falling apart at the seams again.

if you wouldn't mind doing a quick local clone of this PR and making sure it works as intended (just build a rustdoc-js test at stage 0), that would be appricated.

otherwise i've gotta sort out this whole mess.

@lolbinarycat
Copy link
Contributor Author

ok, did something serious regress?

i just deleted build, rebuilt everything, and i'm still getting this:

Error: Cannot find module '/home/binarycat/src/rs/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-js/basic/search-index.js'
Require stack:
- /home/binarycat/src/rs/rust/src/tools/rustdoc-js/tester.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1225:15)
    at Module._load (node:internal/modules/cjs/loader:1051:27)
    at Module.require (node:internal/modules/cjs/loader:1311:19)
    at require (node:internal/modules/helpers:179:18)
    at loadSearchJS (/home/binarycat/src/rs/rust/src/tools/rustdoc-js/tester.js:403:25)
    at main (/home/binarycat/src/rs/rust/src/tools/rustdoc-js/tester.js:552:28)
    at Object.<anonymous> (/home/binarycat/src/rs/rust/src/tools/rustdoc-js/tester.js:583:1)
    at Module._compile (node:internal/modules/cjs/loader:1469:14)
    at Module._extensions..js (node:internal/modules/cjs/loader:1548:10)
    at Module.load (node:internal/modules/cjs/loader:1288:32) {
  code: 'MODULE_NOT_FOUND',
  requireStack: [ '/home/binarycat/src/rs/rust/src/tools/rustdoc-js/tester.js' ]
}

which suggests rustdoc is not even getting run.

@lolbinarycat
Copy link
Contributor Author

if i run the test with --stage 1, then back with --stage 0, it works correctly.

looks like build artifacts are not being isolated enough or something??

@lolbinarycat lolbinarycat marked this pull request as ready for review January 16, 2025 19:38
@lolbinarycat
Copy link
Contributor Author

anyways, i did get a stage0 rustdoc test to run successfully, so.. manual testing complete?

@lolbinarycat
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 16, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jan 16, 2025

anyways, i did get a stage0 rustdoc test to run successfully, so.. manual testing complete?

Opened #135603 for the stage 0 failure. I can reproduce the unexpected pass locally via --stage 1 -> --stage 0, but that's not really related to the changes in this PR. Thanks.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 16, 2025

📌 Commit 0ab7842 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 16, 2025
@jieyouxu

This comment was marked as off-topic.

@jieyouxu
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 17, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jan 17, 2025

Actually, I did some investigation locally. I'm not convinced the current formulation of rustdoc-js was implemented with --stage 0 in mind. I would strongly prefer that we require COMPILETEST_FORCE_STAGE0 before we sort out this test suite to make less likely to be run accidentally at stage0.

@jieyouxu
Copy link
Member

./x test tests/rustdoc-js --stage 0 doesn't even build rustdoc, this can't be right.

@jieyouxu
Copy link
Member

I'm going to close in favor of #135605, that we keep requiring COMPILETEST_FORCE_STAGE0=0 to run rustdoc-js at --stage 0, which conflicts with this PR.

@jieyouxu jieyouxu closed this Jan 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants